Merge tag 'upstream/2.04'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 6 Mar 2014 16:39:57 +0000 (17:39 +0100)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 6 Mar 2014 16:39:57 +0000 (17:39 +0100)
commit793482779ca283961d799ef0a2cf7a5f11ccd398
tree7f71d9120c179c9b92129cd08e0f3f7241a8ede0
parent883ca63b12b6229f82275caaadf336272ed6c2d0
parent3153c22c12a6b78b743ddcafaf864c303469f168
Merge tag 'upstream/2.04'

Upstream version 2.04